Skip to content

Align with latest changes upstream#28

Merged
openshift-merge-robot merged 1 commit into
openshift:masterfrom
elfosardo:align-changes-upstream
Mar 3, 2020
Merged

Align with latest changes upstream#28
openshift-merge-robot merged 1 commit into
openshift:masterfrom
elfosardo:align-changes-upstream

Conversation

@elfosardo
Copy link
Copy Markdown

Convert to dnf
Completely remove mdns configuration
Remove sqlite after usage
Remove iptables filters

Related changes in metal3-io
metal3-io#37
metal3-io#39
metal3-io#41
metal3-io#44

Convert to dnf
Completely remove mdns configuration
Remove sqlite after usage
Remove iptables filters
@elfosardo elfosardo requested a review from dtantsur March 3, 2020 15:26
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 3, 2020
@elfosardo elfosardo requested review from hardys and stbenjam March 3, 2020 15:26
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2020
@hardys
Copy link
Copy Markdown

hardys commented Mar 3, 2020

It would be better to cherry-pick each commit IMHO - could you do git cherry-pick -x <sha> for each commit so we maintain the history of each commit from upstream?

@hardys
Copy link
Copy Markdown

hardys commented Mar 3, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2020
@hardys
Copy link
Copy Markdown

hardys commented Mar 3, 2020

We discussed the cherry-pick issue and agreed to stick with the current squashed commit, since the cherry-picks weren't clean due to the different Dockerfile naming

@openshift-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur, elfosardo, hardys

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [dtantsur,elfosardo,hardys]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants